Bug fixing
Merge pull request #4 from saxonmatt/master

Bug fixing