First commit
Added some documentation
Fixes #1 & #3
Updated readme
Merge branch 'develop'