This Closes #1. Sorry @Subv