Corrected some bugs.
Merge branch 'master' of https://github.com/Nic0w/SimpleContactManager.git