Hotfix fixes #150, #152.
Merge pull request #153 from apotheos/master

Hotfix fixes #150, #152.
Merge branch 'master' of https://github.com/CSC495-2014/TeamworkEnglewoodGit