Finalized for v 1.0 release
Bug fixed for initial release
Merge origin/master