Release v1.0_20140904_01

Merge pull request #20 from jstty/master

merged in all changes from phase5 to master