21/5 changes
Merge pull request #11 from kdop/master

bug fixes