Bugfix #17 go bastard go
BugFic #18 merged :S