Working version 1.2.1 merged with master

This is the first version migrated from local TFS along with the documentation.