Merge pull request #19 from abaxter-rh4u/master

Corrected a few bugs