enhancement #3
enhancement #1
enhancement #4
extra cleaning
Merge pull request #7 from wsenjer/v1.1

V1.1