Merge pull request #1 from Snowee/master

push test
prepare for steve commit
met michiel