w/e winter is ...
Adding new feature to Oleg's Branch
Merge pull request #6 from PeterBell/oleg_test_feature

w/e winter is ...