SyncOMatic update
Merge pull request #22 from Particular/SyncOMatic-20140228-104424

SyncOMatic update
Merge branch 'develop' into Issue_20