Merge branch 'patrick'
Merge branch 'master' into patrick
Merge pull request #11 from tavaron/master

try 100
Merge pull request #12 from tavaron/patrick

Patrick