Fixes IssueId #13
Merge pull request #10 from triplem/next_version

Major improvements --> New version