Bugfixes.
Merge branch 'master' of https://github.com/Dansuf/image-installer
Code cleanup.
Another fix.
Merge pull request #1 from Dansuf/master

Some fixes.