Merge pull request #1 from imclerran/master

Major update: