Merge pull request #7 from matth/master

Add link back to original file so we can track it if required
type definition
fix bug
Fix else statement bug