Partial fix for Issue #35


Signed-off-by: Karel Goderis <karel.goderis@me.com> (github: kgoderis)
Fix for Issue #34


Signed-off-by: Karel Goderis <karel.goderis@me.com> (github: kgoderis)
Fix for Issue #30


Signed-off-by: Karel Goderis <karel.goderis@me.com> (github: kgoderis)