Merge pull request #34 from gizmohd/master

Merge from gizmohd/vixen
Merge pull request #35 from gizmohd/RDS

Rds