checkpoint
Merge pull request #154

c1928e7 checkpoint (iamsmooth)