sulami many updates, fix #1

Latest commit 728a746

May 24, 2016