Merge changes from dev

diff --cc Rakefile
index 40fee446014570bb823899eeb4540bfe8489c7e1,2d842cdd399bd92d17dd9de9eb32bad0286429bf..4fce26f2bef97653e183e6b85cb6be5c235d2261
--- 1/Rakefile
--- 2/Rakefile
+++ b/Rakefile
@@@ -13,14 -13,14 +13,10 @@@ require 'rbconfig
  #------------------------------------------------------------------------------
  # Envrionment Definitions
  #------------------------------------------------------------------------------
--# Detect the windows platform and provide a task to force posix
--is_windows = (Object.const_get('RUBY_PLATFORM') =~ /mswin|mingw|cygwin/)
--task(:posix){ is_windows = false }
--
  # Define the compiler environment
  Env = Rscons::Environment.new do |env|
 -  env.build_dir('source','build/obj/source')
 -  env["CFLAGS"] += ['-Wall', '-Wextra', '-Werror']
 +  env.build_dir('source/','build/obj/source')
 +  env["CFLAGS"] += ['--std=c99', '-Wall', '-Wextra', '-Werror']
    env['CPPPATH'] += Dir['source/**/']
  end
  

diff --cc tests/main.c
index 8e12161cc46b35454addd5dd8fc7264c099a1cfa,5c68846d3d1295983205834bdff4bec5278b5b12..b22a93a3d045a7a365ca4b9169e00d2d6d549e26
--- 1/tests/main.c
--- 2/tests/main.c
+++ b/tests/main.c
@@@ -7,6 -7,6 +7,7 @@@ int main(int argc, char** argv
      RUN_TEST_SUITE(Vector);
      RUN_TEST_SUITE(List);
      RUN_TEST_SUITE(Buffer);
 +    RUN_TEST_SUITE(String);
+     RUN_TEST_SUITE(RBT);
      return PRINT_TEST_RESULTS();
  }