Merge pull request #55 from FWAJL/master

Bug fix
test brian
Merge pull request #56 from FWAJL/Development

Development