Admin

Please pull this branch - We have resolved issue #11.
We should add a unit test for this.