updated code
Merge pull request #427 from Qwinix/issue_422

updated code
Merge pull request #633 from Qwinix/master

minor update: links at Alan's bio