Finished re-write
- command methods moved to separate class
- bug fixes
- v2.1.0 compiled against 1.6.1 dev build