somme usual stuff
Merge pull request #12 from Alex237/master

some usual work