Merge pull request #3 from borisyankov/master

SyncUp From Master