Added some functionality
Merge branch 'master' of https://github.com/schloepke/jbasics