Merge pull request #14 from Zarph/master

asd
ylp
conflics resolved