Merge pull request #61 from untergeek/master

Small fix for optimize, version changes, etc.