Updated JavaDoc.
Implemented missing functionality (was throwing UnsupportedOperationException)
Merge branch 'dev' into account_store_mapping