CHANGED fixed some bugs
Merge pull request #29 from flubbes/update-1

merge update-1 into jos