Merge pull request #1 from Astonex/master

Update from original 27.09.2014
Merge remote-tracking branch 'upstream/master'
Corrected string comparison
Merge remote-tracking branch 'upstream/master'
Safe string comparison
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Refactoring: decomposed account creation into independent blocks
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master' and Refactoring
Refactoring 2
Merge branch 'Agava46-master'