nickcalyx Merge pull request #11 from silke/master