0.17 version
Merge pull request #14 from indykish/0.5

0.17 version