Merge pull request #89 from EricWittmann/master

Fixed a build dependency issue with demos