Merge pull request #35 from mikedlowis/development

Development
Undefine assert if it's defined already
Added location info and custom messages to exception handling.