fixed bugs #5 and #6
Merge branch 'master' of github.com:amberheilman/IMuDB