, Ash/13w41 fixes

HI ,

Please Merge this pull request this contains fixes for issue #16 issue #17 and code alignment with unix Style