0.1.2

Switch from a static class to a singleton class