Refactoring and bug fixing
Merge pull request #5 from initrunlevel0/master

Self commit