Version 2.0

Making it more flexible.
Old Version

Removed old version.
Merge pull request #1 from karso/version-2.0

Version 2.0