small changes, bug fixes
new changes, fixes #3
test
Merge pull request #85 from bramwell2010/develop

Develop