Merge pull request #13 from flashii/master

Merging stable part 2 electric boogaloo
Merge pull request #14 from flashii/master

Add linky
Merge pull request #15 from flashii/stable

Stable