charlenet new stuff replaced
Merge pull request #3 from charlenet/master

see this