8th feature, plz pull me
Merge pull request #1 from Namrack/master

8th feature, plz pull me <- merged.