Merged with development version

Features
=======

Added more features... yaay!