nayafia Merge pull request #57 from pgbovine/master