changes that work
Merge pull request #7 from AlexMaxseiner/master

changes to nkihils stuff