Added testmain to test functionality
Merge branch 'master' of https://github.com/TorbenHaug/BS