Initial new version.
Merge pull request #1 from jsacksick/bojan

Initial new version.