Merge pull request #58 from janaspage/master

Working copy for local host again.