Merge Fix of issues#16 (https://github.com/cloudspokes/direct-app/pull/74)