diff --git a/geomagio/WaveserverFactory.py b/geomagio/WaveserverFactory.py
index d088376c2f7e57c438e459bff86180b1a09fd848..6951b45c660677bf2502b938ebeb60ab3e9593cb 100644
--- a/geomagio/WaveserverFactory.py
+++ b/geomagio/WaveserverFactory.py
@@ -14,7 +14,7 @@ class WaveserverFactory(object):
     def __init__(self, host, port):
         self.client = earthworm.Client(host, port)
 
-    def getTimeseries(
+    def get_timeseries(
             self, observatory, starttime, endtime,
             channels=('MVH', 'MVE', 'MVZ'), location='R0', network='NT'):
         """
@@ -40,7 +40,8 @@ def main():
     factory = WaveserverFactory('136.177.50.84', 2060)
     starttime = UTCDateTime(2014, 6, 12, 5, 0, 0)
     endtime = UTCDateTime(2014, 6, 12, 5, 30, 0)
-    result = factory.getTimeseries('BOU', starttime, endtime, 'R0')
+    result = factory.get_timeseries('BOU', starttime=starttime,
+            endtime=endtime, location='R0')
     # result += f.getTimeseries('BOU', starttime, endtime, 'R1')
     result.plot()
 
diff --git a/geomagio/__init__.py b/geomagio/__init__.py
index 1f6c5db88288c9f7c41e730b50c53918189da1b7..f331015574c029256761958f2e015be3d0fb23ef 100644
--- a/geomagio/__init__.py
+++ b/geomagio/__init__.py
@@ -6,6 +6,7 @@ import ChannelConverter
 import StreamConverter
 from TimeseriesFactory import TimeseriesFactory
 from TimeseriesFactoryException import TimeseriesFactoryException
+from WaveserverFactory import WaveserverFactory
 
 __all__ = [
     'Algorithm',
diff --git a/geomagio/edge/__init__.py b/geomagio/edge/__init__.py
index bbb1d3c108387699b2091028bcd9745bbc3a8e8a..193d0192a9b9fca1cf73c89429619be4df1bc039 100644
--- a/geomagio/edge/__init__.py
+++ b/geomagio/edge/__init__.py
@@ -3,8 +3,11 @@
 
 from EdgeFactory import EdgeFactory
 from ObservatoryMetadata import ObservatoryMetadata
+from RawInputClient import RawInputClient
 
 __all__ = [
     'EdgeFactory',
-    'ObservatoryMetadata'
+
+    'ObservatoryMetadata',
+    'RawInputClient'
 ]