Issue 34

Manual verification of functionality on internal cloud account, server elk-mon-1.  Ping me if you need the details.