Merge pull request #12 from millesky87/master

stuff