Merge pull request #1 from BeScala/master

sync2