update for summersemester
Merge pull request #47 from riddlore/master

update for summersemester