201407062030 | v 1.1

Bug fixes and additional functionality