Merge pull request #69 from barspi/master

Some proguide fixes