Merge pull request #18 from khawkins/unstable

Plugin: merging master to unstable