General Version Increments + Some Cleanup

Issue Fix: Resolve #14