changes after 6/14 webcast
Merge pull request #3 from nickiznk/master

changes after 6/14 webcast