Merge pull request #13 from escherba/master

sync (2)