Merge pull request #22 from ns452/master

hopefully it is done?