Merge pull request #1 from paazmaya/master

Update from original
Add 2014-09-30 pull request
Project link added
Merge pull request #61 from olemstrom/master

Add 2014-09-30 pull request
Merge pull request #63 from Markoham/master

Project link added
Minor update
Fix merge conflict