Develop

Updated to version 2.1 Beta and added a couple of nice features. This is completely backwards compatible.

Solves issue #5.