Fixed endless loop in installer. Fixed #99
Merge remote-tracking branch 'origin/refactoring' into refactoring